remove main() function
some cleanup