This code should be removed