Bugfix; Removed debug code;