Fix alignment issue
Remove old variables