Removed dead code
Added completion tracking - very slow for now