Refactor - Clean some code that is not used.