Removing unused launch images and a couple of classes

Issue #790 

Instead of trying to merge the outdated commit #882 I am going to be doing multiple PRs for cleanup.