Removed SPVisibility and commented code