Fixed line creation + deleted useless classes