a bit of cleanup
remove stupid thin
cleanup