Removed some unused objects