Moved RestrictedLabel to own file, cleanups