Cleanup of properties, include java in common