Removing method that causes 500s