all cleanup

Signed-off-by: Shirley Shaw <shirleyshaw.is@gmail.com>