Removed unnecessary code, adjusted startup setting