Removed unused code.
Dry lib, fat specs.