Remove cumbersome code prone to errors related to ASU