Clean up
remove stats
Finish service refactor