Remove todo's that have already been addressed
Use proper locations method