removed needless class rewrite