Removed unused methods
Removed more unused methods, and improved logging