Remove APC related stuff