Remove Redundant methods
Cleanup tests