CODE: More code cleanup