cleanup patches