cleaned up, removed tests