Removed dated code from main