Simplified types, added averaging bits
Remove old dead file