Cleanup
Reenabeling ertifacts