Removed completed TODO
Retconned controller modules into concerns
Removed unused local
Fixed unintended overlapping character classes in regexp
Removed completed TODO