Clean up code from last commit