Tidy Up: Remove the redundant services