Cleaning up the classes, remvoing unused libs