clean up arris related stuff and old aliases