Removed unnecessary code and libs