Removed a couple of unused objects