Further file clean up