Clean-up

deletion of legacy code