remove commented code
refactor Site class