Removed dependency on clasp