Removed the old and unused heuristic based Has2DPanel() function
Did some code cleanup