Some cleanups for ASC 2.0 and removing useless parameters