Removed tests and proc