Implemented removeKey method (WIP)
Cleaned up source code, expanded macro use
Fixed missing „this“ errors