Removed Some Dead Code