[BugFix] #548 and #728 + cleanup of unused files.

__Code Review:__ http://mrccodereview.cloudapp.net/ui#review:id=1293