Removing pointless test