Finished commenting out