cleaning up to have only what is needed