Close to final
file clean up