Moved with_metaclasses to util and removed the unneeded six stuff