Cleaned up code, removed loggers, commented out code, etc.