Cleanup to remove comments and byebugs