General cleaning pass 1