Removed more lines