remove empty listener
cleanup