Guess not. Also removed other unused things.