add macros to expose flat containers when available
remove stray file