Fixed #(95) - /organization works once again.
Removed commented wasteful code.