Update staging framework again
Code cleanup