Edit through end
Clean up homog/heterog