Bug fixes (now deleting and dropping only the correct filled lines)