Feature/backend cleanup