cleanup, removal of unused code