Equipmentcleaup

Tested using the qml client. will open a pullrequest for it soon.