Tiny changes... removal of legacy code