Remove even more unnecessary stuff