Code clean up on import, do not believe it will fix the error though, more investigation needed.