Actually removed files and replaced with ACE features