Removing test crap