Some further small changes to clean up imports. Removed need for neo4j here. Plugin now imports it itself.