Removed overly complicated crap