Expanded service and code cleanup