Remove reliance on In.java