[TASK] Code cleaning

I found some leftovers.