Removed ifdefs from former experiments