Some file clean ups