refactored and got tests passing again
Removed uneeded files