Removed legacy comments and logging function