Cleaning up the engine properties a bit so only one is ever declared