Comments out more code for bug fixing