[WIP] removing unnecessary class