Removed a couple of outdated action calls
Step towards a functional serving class