Clean up.. Just keep custom panel