remove main, clean up in general