removing C++ objects and re-organizing the view