Cleanup
Removed count
Misc cleanup