Original commit with removal of services that no longer work