Remove old implementation of folding and marker panels