#323 removed unnecessary vars