Merge "Removes unused function from javelin"