Remove unnecessary checks which cause Rosecheckers to throw warnings