Review the updating of timeout and cleanup of imports / utils