Little cleanup and areas get removed regardless of caps