Removed superfluous crap