Removed some unnecessary libraries and cleaned up the rest