Remove auto start, misc cleanup