remove/comment-out old static implementation