Update comments

Remove excess/old code and console logs and update the comments