Remove guard dependency - It is just nice to have