Removed point-less throwns