Remove old allocation code