removing generation step