Removing obsolete java code