Removed unneeded code
Starting to rework the UI system.