Housekeeping: removed redundant classes