Removed dependencies on external system jars