removed some unused code and imports