More useless things removed