Fix category compiler warnings
Remove UTSingleton