Removed extra layer.
Setup for later optimization.