Remove commented code
Fix build