Removed unused vars and navigation jsp bar