Removing old m-a stuff