clean up engine and fuel code to fully use RF