removed some unused code and tests