Remove non-admin if-statements from header and scripts
Generate new images into normal test live directory to save manual copying