Change stack size, remove unused variables
Remove useless comment