Removes part of code not present in master anymore