Remove app dependancy and add file limit