improved context and model clean up