Removed some unnecessary (hopefully) code