Revert "Improvements"

Reverts cobaltcrm/cobalt#49