Cleanup questions implementation