remove really ugly hardcoding