Removed shutdown timer debugging
Minor adjustments