Removed some rm() calls