#1, #2, removed files unneeded because of sentry authentication