Cleanup mistakes in last commit