Remove methods that are not needed anymore