cleanup & revert old code
get future safely