Removing buggy functionality until it is fixed