Refactored code
Deprecated
Removed tests from being pushed