Updated to GAE - 1.8.6 and cleaned up the code.