Removed unnecessary code and packages