still no type inference, but removed extra/incorrect declarations