Remove unicode() calls, change loader