removed stale stuff, commented out logs, refactored files