Cleanup after messed up last commit