Removed extras packages and cleaned up other files.