cleanup
Working 081 py and hs versions