Remove senseless code lines

Remove senseless code lines to get it clearer arranged and even smaller