Removing unused stuff since DI