WIP: Fixing / cleaing variables that are not required