Removed tests and logic