Fix term issues
cleanup