Move discussion into request model
remove obsolete code