cleaning up old unused code