Removing Layer class, only batching when needed