Deleted old code and "cleaned" the tab-classes