Removed TODO-gas