cleaned up unused code, removed TODO