Remove duplicate line and move another closer to its actual use