changes for cleanup