Prevent naming issues later
Removing useless code and adding todos