Reverted model & controller changes since using JSONP