All this junk shouldn't be needed