removed some unused objects