some deletions and cleanup