Replaced STL vectors and maps by Qt-style
Implement working mapping removal
Cleanup of comments