Further refactor and clean up of commented out older code, load time is now less than 5ms