Removed unused and broken lines