Minor Refactoring

Removed unused methods and logs