Removed some unnecssary stuff