clean up and added startup on boot