Clean up unused functions and tweak spec name