Remove controller & routing