More deletions and cleanup