removed organization model and related code
fx