Remove more not really used things