Initial commit after cleanup.