Removed gunicorn + refactor