Cleaned up broken commit