Remove GAE related code and fix #7