Uncommenting temporarily commented code for successful build test