Cleanup #453