Further cleanup, added octos