TODOs, removed file and update CUP