Cleanup by Sameh