Small cleanup for 6.0.3