BugFix, CleanUp