chore(TODO): cleaning up TODO items