Removed unecessary method/test
Refactored: removed/renamed methods