Initial clean up contd...