Some modifications to remove unnecessary gem lib