removed unncessary spinner code