switch to java_symbols and cleanup requires