Bug fixes

Debug - remove it