massive cleanup. much better mobile access