remove unecessary objects, ui implications, and fix default vars