Cleanup and project config parsing