kicked non working stuff out