Clean up un-used code
Build 0.2.2