Removed random stuff that slipped by.