The idea is to cleanup the code base in order to have other works touching a lot of components easier.
This will create a new commit in order to revert the existing changes.
