Removed unnecessary libraries. Cleaned up some base classes