Bugfix cleanup