remove deprecated items.

re-format codes.