Remove not working stuff