Removed unneded checks