Delete obsolete variables
Clean up main a little more