Remove a lot of cruft
Some additional tweaks