Missed deleting some lines and adding the static initializer