removing unused constants and packages.

removing unused constants and packages.