Removed unused libs and code