General clean up of project and API decision logic