Finished manual merge of @devongundry's changes.
Removed some unused image files