Removing BF only stuff