remove unused variable, put switch default case in place.