Removed more leftover flawed Parrot features.