Layout: Clean-up of the EPM and camera fragments