more whitespace cleanup, remove old dictionary