Remove old shim code from controllers, change templates to allow full path