Clean up 3

More cleaning up. Some stuff quoted out for later use.