some cleanups on green panel