Added flash-message-success and route cleanup