Add simple statistics
Remove commented out code