Tidy Up
Remove Error & Success Blocks