Remove "upgrade" messages
Clean up comments
Remove unused files