Remove animation by default, bugfix for empty map