Refactor

Removed commented out code
Do collection of data for admin dashboard