Project Cleanup and removal of deprecated API identifiers