New fork with junk removed.

This fork to be use until magowiz return.