Cleanup unused ace stuff and update.