cleanup, trying to get js cooperating