Cleanup of stragglers

Second commit