clean up, remove multiple warnings