Sloppy Integration of Sentry. Need to Clean it up