Removed unnecessary display and mode stuff...