Commented code, removed cursors