Deleted old junk
Made compatible with 4.1, and possibly 3.2