Comment out dispose methods until architecture is fixed