Remove even more code