Corrected more trash issues