Removed external mapping, Opus testing complete