reorder Goldstone bosons
remove unused function
correct function name