Adding framework image and some cleanup.