If you do not have different kind of habitats, you could just remove the variable from just the aggregated format. But you have to leave the definition defined on the atomic version to 'fool' the system. This is definitly a 'hack'; but I hope you can use this for our initial version release...