Removing CSPAsker dependency