removing view state check