Removed a few unused objects