removed classes due to common library