Cleanup of useless comments, dropped some unused packages, and added some new stuff