cleanup
include self in extensions