#61 Remove some orphaned code