BF: a bit too much code cleanup