actual remove bp on remove all & some indentation fixes -.-
some cleanup