remove unnused methods and other random improvements