Final clean up on Device Service and Controller