ZF4 Cleaning

Getting it back to "normal"