Fix up readme and remove commented out code