reducing dependencies to libraries. code cleanup of unused members.