Removed excess crap