remove complex and hidden parameters, clean up a bit