Updated to latest archon, cleanup