fixed bug with system successor msg
cleanup