Fix double classpath entries
Remove old code