Remove dependancy with App Framework