Removing unused classes
Improved error handling
Improved setup script