Removing hull specific helpers