Fixes whitespace
Removes unused functions