Removing commotionbase dependency