removing un-needed conditional