Update TODO and remove unused user attributes