Got rid of some nonesense