Removed some crap, which didn't want to be removed last time.