Clean up tick.java [stable]