#hyhull-131 Removed unneeded code