Remove unneeded controller logic