some cleaning up of unused code