Remove code which has been refactored into services