Clean up code after last bugfix