Much needed cleanup step #1