Removed weak references as they are not needed.