cleaned up unused code