Remove obsolete code from Project