Merge "cleanup deprecated lingering code for otasp"