Remove lib, fix command issues