UI, Code cleanup, Dependency cleanup