Some cleanup and removal.