NFR: Removing some leftovers.