Removed unnessacery elses