remove unnused methods and other random improvements

lol D: