Hurrr durrr - removed idiotic todo's