adding missed files and removing some console logs