remove bad visibility code
Refactor item use
Add effects
add remove effect to effect