Removed all changes concerning compatability with Google App Engine