Cleaned up libraries somewhat