More rearraning and removing