Comments out code for bug fixing