Removing hardcoded reference to /opt