Remove login and instrumentation

@eric79