cleaning up unused code