Removing some unused declarations