Removed dead code and added TODO