Remove deferred loading, it still have some bugs :(