Clean up from last commit