Moved clearing of signals to a default case in the case statement

This allows for the values to be retained until they are pushed