remove TODOs and nonsense comment