Removed unused stuff, README cleanup