Clean move-links Java code