Clean up comments and prepare for deploy