Removed unused libraries and code