-Simplify quick panel reset
-Remove dead code