Remove layers to improve performance