Remove some redundant todo's and bug tags