Updated Hask
Delete some unused code