Cleanup
Fix botched commit