removed type parameter from tables