Final cleanup removed all workarounds
removed typo from all files