Cleanup #459