Remove unused functions
Formatting fixes