*Fixed some errors and removed app keys