TODO removed from code