Remove logic as I'm unsure it's needed