Clean up unused functions
Handling of blank staves