Cleared some todos