Merge "Removing unnecessary asset." into oc-dev