This method should also be removed.