This are only used once now and can be inlined