Update and clean up

Removing unused module. Updating modules and a bit
of limiting.