Removed some unnessairy stuff