removing remaining interface classes