Minor tweaks and corrections.

Abrogated unneeded code and libraries.