Removed old comments and logging