cleaned up unused code. Got rid of some TODO s