removed 2 things