remove unused handling