Removed unused methods and cleaned it up a bit.
Releasing this as 1.1