removing extra stuff copied over from basic_web_app