(maint) fix indentation
(maint) remove unused methods
Merge pull request #1807 from dalen/maint

indentation fixes and dead code removal