Removed defer from controllers