Remove fixme
Remove some unnecessary lines