* Simpfy the query
* Refactor Auth fns
* Remove ontime project