Removing fixme and console logs