Remove some unused code
Add SimpleCov for code coverage