Fixed Bug 565 draw image fails; removed some unused files
Merge TFS Changeset 1713