Rework of command handler and send classs

Removed much test code