Removed some unnessaearcacy stuff