Remove optional stuffs (add manually later on different machines)