Cleanup whitespace/unused code