Legacy code & cleanup | Service brief