Got rid of unnecessary endpoints, introduced app dependencies