removed some unused/unnecessary code