Removed useless variable and added TODO