Modifying interface and cleaning up TODO's
Cleaning up TODO's adding DeleteVisitor