removed the all-am stuff again