Added remove method

Signed-off-by: Roj Vroemen <roj.vroemen@azion.nl>
Add method to caluculate the total

Signed-off-by: Roj Vroemen <roj.vroemen@azion.nl>
Add an extra check

Signed-off-by: Roj Vroemen <roj.vroemen@azion.nl>
Change the rules

Signed-off-by: Roj Vroemen <roj.vroemen@azion.nl>