Remove redundant code and implement servicenow stuff