Added routes + end of line removal