Some fixes before remove follower implementation.
Some workarounds to make it works.
Cleanups