Getting rid of more useless things