Fantomas cleanup
Fantomas cleanup