Remove unused and pointless lines