removed unnesessary classes