Removed unnescesarry code