master : Remove some code which should not be introduced yet