Update for the final cleanup pass
Signed-off-by: Chris Sanders <zidane@outlook.com>