Removed some unnecessary bits