Fixed back stack issue and removed unneeded lines.