almost there for the cleanup