Cleaned up some appid stuff