Fix Smartass2 and remove modules