Lion clean up

Lion clean up