Code cleanup and jumping fix.
Commented out.