Deleted libraries and adjusted var definitions