Control and Allocation clean up