Code cleanup, removed some unused methods, preparing for release