removed class definitions