Snikolov/re cleanup app file