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