cleanup for pure bugfix branch