Removed all that crap