Removed some un-needed bits