Commented code, removed debug console messages