Removed some unnecceassy code