Cleaned up from intermediate commit