Remove static, not necessary