Clean up from previous commits