major changes for dev-cleanup

to match with the changes to InformaCam RC2