Cleanup initial commit mess