changes to allow cleanup