cleaning up unused bits due to the new service reset setup