DEV: Remove comment as BD is implemented