Remove this nonsense for now (It wasn't working anyway)