removing some unnecesary stuff