Any particular reason to remove this ? @magopian would know the consequences :)