removing a few TODOs and some cleanup